--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit c0312bf1a0bef0a67f40c9471171cd7dbc619938
Parents : 54e2728
Author : Ivan <ivan@quad4.io>
Signature : Signature validation error
Date : 2026-04-22T18:37:53-05:00
fix(snap): update make:snap command to include debug environment variable and remove unnecessary build environment setting
Changes
3 files changed, 5 insertions(+), 16 deletions(-)
Diff
diff --git a/.github/workflows/build-linux-packages.yml b/.github/workflows/build-linux-packages.yml
index cb7afbe1..e7a80294 100644
--- a/.github/workflows/build-linux-packages.yml
+++ b/.github/workflows/build-linux-packages.yml
@@ -150,7 +150,6 @@ jobs:
env:
FRONTEND_ARTIFACT_NAME: ${{ needs.frontend.outputs.artifact_name }}
MESHCHATX_FRONTEND_PREBUILT: "1"
- SNAPCRAFT_BUILD_ENVIRONMENT: host
SNAPCRAFT_BUILD_INFO: "1"
steps:
- name: Checkout
diff --git a/package.json b/package.json
index 58857431..227ba87a 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"start": "pnpm run build && node scripts/electron-forge-local-tmp.js start",
"package": "pnpm run build && node scripts/electron-forge-local-tmp.js package",
"make": "pnpm run build && node scripts/electron-forge-local-tmp.js make",
- "make:snap": "pnpm run electron-postinstall && pnpm run build && cross-env FORGE_MAKE_SNAP=1 node scripts/electron-forge-local-tmp.js make --targets @electron-forge/maker-snap",
+ "make:snap": "pnpm run electron-postinstall && pnpm run build && cross-env DEBUG=electron-installer-snap:snapcraft FORGE_MAKE_SNAP=1 node scripts/electron-forge-local-tmp.js make --targets @electron-forge/maker-snap",
"make:flatpak": "pnpm run electron-postinstall && pnpm run build && cross-env DEBUG=@malept/flatpak-bundler*,electron-installer-flatpak* FORGE_MAKE_FLATPAK=1 node scripts/electron-forge-local-tmp.js make --targets @electron-forge/maker-flatpak"
},
"license": "0BSD AND MIT",
diff --git a/scripts/ci/github-build-linux-snap.sh b/scripts/ci/github-build-linux-snap.sh
index 331b266b..ce87b5e6 100755
--- a/scripts/ci/github-build-linux-snap.sh
+++ b/scripts/ci/github-build-linux-snap.sh
@@ -1,16 +1,6 @@
#!/usr/bin/env bash
# Build a Snap via electron-forge's @electron-forge/maker-snap.
-#
-# Expects ``meshchatx/public/`` to already contain a prebuilt frontend bundle
-# (downloaded from the reusable Frontend build workflow), so this script only
-# rebuilds the cx_Freeze backend before running ``electron-forge make``.
-#
-# Required system packages (installed by the workflow):
-# - snapcraft (installed via ``snap install snapcraft --classic``)
-# - LXD or multipass when building outside ``--use-lxd``/``--destructive-mode``
-# (electron-forge invokes snapcraft itself; we set
-# ``SNAPCRAFT_BUILD_ENVIRONMENT=host`` so the snap is built directly on the
-# runner without needing a build VM).
+
set -euo pipefail
ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
@@ -27,6 +17,6 @@ pnpm run electron-postinstall
pnpm run version:sync
pnpm run build-backend
-SNAPCRAFT_BUILD_ENVIRONMENT="${SNAPCRAFT_BUILD_ENVIRONMENT:-host}" \
-FORGE_MAKE_SNAP=1 \
- node scripts/electron-forge-local-tmp.js make --targets @electron-forge/maker-snap
+export DEBUG="${DEBUG:+$DEBUG,}electron-installer-snap:snapcraft"
+
+FORGE_MAKE_SNAP=1 node scripts/electron-forge-local-tmp.js make --targets @electron-forge/maker-snap
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────